Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/source/NewsComponents/Core/NewsHandler.cs | 12 | 9 | 340 | 237 | -- | 3 | SM |
/source/RssBandit/WinGui/Forms/WinGUIMain.cs | 11 | 9 | 38 | 34 | -- | 0 | SM |
/source/NewsComponents/Feed/feeds.cs | 5 | 3 | 133 | 24 | -- | 1 | SM |
/source/NewsComponents/Feed/NewsGatorNewsHandler.cs | 1 | 0 | 15 | 0 | -- | 0 | SM |
/source/NewsComponents/Feed/GoogleReaderNewsHandler.cs | 1 | 0 | 15 | 0 | -- | 0 | SM |
/source/RssBandit/Core/RssBanditApplication.Commands.cs | 2 | 2 | 8 | 8 | -- | 0 | SM |
/source/NewsComponents/Feed/WindowsRssNewsHandler.cs | 1 | 1 | 720 | 4 | -- | 0 | SM |
/source/NewsComponents/Feed/BanditNewsHandler.cs | 1 | 1 | 219 | 158 | -- | 0 | SM |
/source/NewsComponents/Search/LuceneIndexer.cs | 1 | 1 | 57 | 57 | -- | 0 | SM |
/source/RssBandit/Core/RssBanditApplication.EventHandlers.cs | 1 | 1 | 2 | 2 | -- | 0 | SM |
/source/NewsComponents/Search/LuceneSearch.cs | 1 | 1 | 2 | 53 | -- | 0 | UM |
/source/RssBandit/Core/RssBanditApplication.cs | 2 | 4 | 6 | 70 | -- | 0 | UM |